Auto merge of #3274 - alexcrichton:more-travis-again, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 8 Nov 2016 16:30:24 +0000 (08:30 -0800)
committerGitHub <noreply@github.com>
Tue, 8 Nov 2016 16:30:24 +0000 (08:30 -0800)
More travis again

Landing this again hopefully with the doc fix


Trivial merge